PR #7102

PR #7102 is not in the merge queue.