closes #2003
closes #2018
merge