Closes #3788