Closes #3094