Merge "Don't fail if TAG_ALLOW_WHILE_ON_BODY is missing" into sc-dev