Hotfix list
Conflicts
Merge branch 'release_branch_1.0'