#3630. Closes #3425.