Merge remote-tracking branch 'origin/branch-cma'
Merge remote-tracking branch 'origin/master'
Little changes for database initialisation.