PR #5788

PR #5788 is not in the merge queue.