PR #7190

PR #7190 is not in the merge queue.