latest changes
Merge branch 'release/r1.0'