PR #7078

PR #7078 is not in the merge queue.