PR #7033

PR #7033 is not in the merge queue.