Closes #4482