PR #7024

PR #7024 is not in the merge queue.