closes #3508
closes #3512