Merge "FIx Accounts with identity v3 and v2 data in yaml"