Merge branch 'release/2.1.0-1' into develop
Update path to rosy.
2.1.0-2
Merge branch 'release/2.1.0-2'