Merge to tag public-0.5 (generateds)