PR #7313

PR #7313 is not in the merge queue.