Merge "Fix: Rebase around the CSIT repo script"