closes #3620