Merge pull request #16191 from terfendail:lres2c_fix