Merge branch 'release/1.1.2' into dev
fix bootstrap pre conflict
bump version
Merge branch 'release/1.1.3'