Merge branch '4.0.0-M3'  - part 1