Merge pull request #4118 from petertiedemann/fix-bug-48516