Merge change 25639 into eclair

* changes:
  do not use transactions for calls that just read the DB