Note, this is a backport of https://github.com/openembedded/openembedded-core/commit/91d7580344fe5a15a9bf059dceedab42f7ba3e54 which is relevant for Scarthgap