Merge PR #4795

Merge PR #4795