Merge "Fix for HAS to run its CSIT"