[sig-policy] Implementation of prop-117