Merge "Add strings for System split" into main