Merge branch 'release/1.0.4' into develop
Fix mock library import
Increase version
Merge branch 'release/1.0.5'