final commits to bring policy in alignment with the SCA specs