Hotfix part1
Hotfix part2
Merge branch 'hotfix/Hotfix07'
This is the second Hotfix finish message: MERGE_MSG
Merge tag 'Hotfix07' into develop

This is the first Hotfix finish Message: TAG_EDITMSG