Merge branch 'dbFixing' into dev