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