Merge "CSIT: Make script inclusion more readable"