Closes #3620