Merge branch 'hotfix/01.03.01'
fix tests
Merge branch 'hotfix/01.03.02' into develop