CR1
CR2
CR3
Merge branch 'release-1.0' into develop