Merge "Fix T110 violation for database client"