PR #7154

PR #7154 is not in the merge queue.