PR #7086

PR #7086 is not in the merge queue.