PR #7017

PR #7017 is not in the merge queue.