Merge "Make database ping() method avoid starting transactions"