Closes #1710