Note: This patch doesn't apply cleanly to styhead due to scarthgap missing one commit: https://lists.openembedded.org/g/openembedded-core/topic/scarthgap_patch_1_2/110128235
 
I submitted two backport patches with the missing commits from styhead to scarthgap to sync the branches. Should make things easier to upgrade both branches at the same time.