Merge bk://oe-devel.bkbits.net/openembedded