Closes #1382