(HLS) Fix merge with master.