Patch from Darin Adler (#54166)