Merge PR #3185