Closes #2281