PR #7361

PR #7361 is not in the merge queue.