PR #7053

PR #7053 is not in the merge queue.