#JC-1251 restritions to service. without tests