BIG Halo removal and preparation to new PA's HOVER (2/2)

Change-Id: Icac68ed6c9a0b23a3e181a0bfa477ff844ff8610