closes #3681