Merge "Always do a HIT_TEST" into jb-dev