[OSCAREMR-6952]