Set production database creation to 'update'
Merge branch 'test' into development