Merge pull request #4830 from spencer-burke/fixing_4222-2.16

2.16 Backport of #4659