Bugfix part 1
Bugfix part 2
Bug fix part 3
Bug fix part 4
Bug fix part 5
Merge branch 'fix/fix-another-bug' into release