PR #7136

PR #7136 is not in the merge queue.