closes #3670