PR #7316

PR #7316 is not in the merge queue.