PR #7356

PR #7356 is not in the merge queue.