PR #7254

PR #7254 is not in the merge queue.