Closes #2582