PR #7023

PR #7023 is not in the merge queue.