some fixes for uno7
Merge remote-tracking branch 'Places/CustomBranch' into CustomBranch
merged conflict in dbhandler