PR #7034

PR #7034 is not in the merge queue.