Branch 1.0 for 3.0.* compatibility