Closes #2615