PR #7056

PR #7056 is not in the merge queue.