Fix Manifest tests errors from meta-sh
Merge remote-tracking branch 'origin/future/0.1.0' into future/0.1.0