Merge branch 'hotfix/v01.03.03'