PR #7598

PR #7598 is not in the merge queue.