closes #7164
closes #7175