closes #3396