Merge "Correct typo in TYPE_SYSTEM description" into sc-dev