PR #7111

PR #7111 is not in the merge queue.