release 1.0.1-b4
Merge branch 'release/1.0.1-b4' into develop