PR #7367

PR #7367 is not in the merge queue.