Halo (2/2)

Change-Id: Ibe10027ee53172646d70386a00175299c4e56aae
Halo size (2/2) - This commit complements this: 3f401366b68197d1c1a583c44aeb798d010de625

Change-Id: I668f454fb082ed7d43222a8d2dad0779c76bdc84