Merge 'hls' branch into development branch