Initial migration from Google code at 2.0.29