Merge "Support Hysteresis Db settings"