PR #6042

PR #6042 is not in the merge queue.