PR #7022

PR #7022 is not in the merge queue.