PR #7063

PR #7063 is not in the merge queue.