Merge "Identity V3 rbac_base method refactor"