Merge branch 'hotfix/fix_missed_merge_tags'
Merge branch 'master' into develop
Fix release file