(cherry picked from commit e12e095)
(cherry picked from commit 6961ca2)
(cherry picked from commit 0bfb3b6)
(cherry picked from commit 079827d)
Also moves default scale to CatchHitObject.