Copy of PR #6615 for release branch

See PR #6615 for details