Closes #2297