PR #7281

PR #7281 is not in the merge queue.