PR #7019

PR #7019 is not in the merge queue.