Merged manifest
Merge branch 'master' into dev_scobb