Merge branch 'master' into remove_DB