Closes #2376