Merge branch 'hotfix/v01.02.01'