Apply major changes for v1.0b