PR #7228

PR #7228 is not in the merge queue.