Merge PR 4479

Merge PR #4479