This closes #1715