[OSCAREMR-6949]