closed #3597:  Merge PR #4846

Merge PR #4846