Merge "Fix parsing code parcelling errors" into sc-dev