Merge "Add postgresql client usage with timeouts"