Sync stuff in 1.0.x only to master