Fix for more possible unit test failures
Merge branch 'master' into unstable_staging