Merge "Modify cadi & misc versions in authz"