Following changes in the RM (ATDAQCCRM-78)