Following RM changes (ATDAQCCRM-78)