PR #7243

PR #7243 is not in the merge queue.