PR #7066

PR #7066 is not in the merge queue.