PR #7054

PR #7054 is not in the merge queue.