Merge "Modify the default values to avoid 2 DB hysteresis DB limitation"