core v2.2.0.2

[Minor] Hitbox new layout fixes