PR #7605

PR #7605 is not in the merge queue.