Merge branch 'master' into moving-data-store-to-sqlite