merge HALO

recent cm-10.1 changes merged and HALO merged