Resync "master" back to open-avb-next

This is a maintenance pull request!