merge upstream and integrate yocto imports into mixin