PR #8017

PR #8017 is not in the merge queue.