Closes #2510