PR #7222

PR #7222 is not in the merge queue.