Rebuilt for 1.6branch revision a