PR #7218

PR #7218 is not in the merge queue.