custom hit test
Merge remote-tracking branch 'origin/brad-carvey' into development