Merge the copy of PR #6615 from release branch back to master

See PR #6615 for details