Merge open-avb-next to master