Merge commit 'origin/org.openembedded.dev' into org.openembedded.dev