[CAFR-543] CAFR-543