Merge branch 'hotfix/1.02.02'
Fixing one more head thing
Merge branch 'hotfix/1.02.03' into develop