Merge back master into testing

Master had some fixes that weren't on testing.   Meanwhile, testing had some version bumps that added some commits.  This will get testing functionally caught up to master and we'll merge back into master after we do some validation.