RES-957: Fixes CR