Merge branch v1.0-M3 to v1.0-M4