Merge "Moving HDR logic from HDRClamper to HDRModifier" into main