catch up on commits from 2-0-stable

this grabs some commits made to 2-0-stable and merges them to 2-1-stable, going to do a follow up PR from 2-1 to master to make it the dev branch