Update hotfix.txt
Merge branch 'develop' into feature/parent-feature