PR #6535

PR #6535 is not in the merge queue.