[#79580686] - Add changes suggested by Darryn Campbell.