Merge remote-tracking branch 'origin/5.0' into bootmanager-vender