PR #6915

PR #6915 is not in the merge queue.