#17657 outsourced fist logical part in service