Merge branch 'hotfix/v01.05.01'