Yesterday
Merge from combat_knife_rotation_fix_2