Merge "Normalize and lower the default DB lag wait timeout"