PR #7099

PR #7099 is not in the merge queue.