* some minor improvements * add a log message when database updates are disabled. (cherry picked from commit a5b3862bc1b066a9614369bda3adef485a57eff8)
* some minor improvements * add a log message when database updates are disabled. (cherry picked from commit a5b3862bc1b066a9614369bda3adef485a57eff8)