adapted to new Yocto AB