Bugfixes branch merge