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