Fixes point a of #214
Merge remote-tracking branch 'origin/master' into db_refactor