Merge branch 'hotfix/v01.00.00.02'