Merge "Fixing the CSIT after AAF update"