PR #6942

PR #6942 is not in the merge queue.