small refactor
Merge branch 'hotfix/01.03.01' into develop