Merge "replace hev_thr_lut[][] with simpler logic" into experimental