This closes #3527