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