Closes #4401