closes #1680
closes #1684