[CAFR-546] CAFR-546