Merge tag public-1.0