HALO update
Merge commit '3f5b8281a7c6f8f0b576cdca03d94558b311446d' into jellybean