Closes #1717