PR #6904

PR #6904 is not in the merge queue.