rather large commit to bring policy into alignment with the SCA spec