PR #7122

PR #7122 is not in the merge queue.