Resolved conflicts for Begall's db fixes
Merge branch 'develop' into Begall-db-fixes
Merge pull request #1812 from piejanssens/Begall-db-fixes

Begall's db fixes