Merge branch 'hotfix/fix_first_feature' into develop