[CAFR-539] CAFR-539