closes #3682