Closes #724059