Merge commit 'local_master/bootmanager-vender' into myplc-0_4-branch