implementation of CRs agreed at CT4#134 and CT4#135