Stuff we did in 1.0.x branch since branching from master (v2)