PR #7153

PR #7153 is not in the merge queue.