PR #7095

PR #7095 is not in the merge queue.