PR #7144

PR #7144 is not in the merge queue.