Fix minor bug in relese branch
Merge branch 'release_1.1.0' into develop