Closes #3082