PR #7280

PR #7280 is not in the merge queue.