RES-957: fixes CR issues