Closes #4361