Merge public-1.0