closes #5239