Migrate updates from chicoreus and ranglin