Closes #2365