[OSCAREMR-6943]