[CAFR-542] CAFR-542