Merge pull request #16521 from saurabh6790/add_patch_to_set_guardian_role

fix: patch to add guardian role if not exists