PR #7232

PR #7232 is not in the merge queue.