Sync to tag public-1.0 (generateDS)