Merge "Fix brightness modifier HDR" into main