Merge integrate/meta-guf-distro/cherry-pick-smaller-changes-from-hardknott