Merge branch 'hotfix/tests'
Merge branch 'release/0.0.4'
Typo

Change-Id: Idf3d9da3ce544c9e0757c9e141973b23e75c9c16
Merge branch 'hotfix/doc' into develop