Commit feature 1235
Merge branch 'release/Release_1.0.0'