Merge "HLS: misc bug fixes"