CR1.05
Merge branch 'release-1.0'