Merge branch 'miso-belica-unique_db_and_user' into upstream-master