Closes #2136