Merge "Move dbSetup=true; follow-up d920237"