Baza + Bugfixes
Merge branch 'develop-upupdate' into develop