Merge branch 'hotfix/fixes'
Merge branch 'hotfix/hot_fix_2' into develop