PR #7223

PR #7223 is not in the merge queue.