PR #7279

PR #7279 is not in the merge queue.