PR #6914

PR #6914 is not in the merge queue.