Merge "Moving HysteresisLevels to DDC, cleanup duplicate code" into main