closes #4488 and #4489