Fix for possible unit test failure
Merge branch 'master' into unstable_staging