Merge "[WIP]Migration to new policy api"