PR #7366

PR #7366 is not in the merge queue.