Merge pull request #29711 from ruchamahabal/leave-policy-assgn-fixes