[sr-dev] git:master: Merge branch 'tteras/db_sqlite'