bug-1131: updates of DRP and CPS