(PUP-2794) Replace "those that" with "those who"