Merge branch 'mk/init-db-parse-options' into next