Generic vendors updates/fixes, CM stuff refresh and fixes/updates for Mako/Maguro