Closes #1392