can only be merged once we fully move to Yocto, OE core is too old and does not support this change (hence the WIP).