PR #7011

PR #7011 is not in the merge queue.