Merge branch 'release/1.0.1'
Merge branch 'release/1.0.2'
Merge branch 'release/1.0.3'
more fixes