[RIC-384] Final changes