I hope they change at least change the visual animations, before release.
IMO, it is immersion breaking to make a weapon attack, holster the weapon on your back, and then make an unarmed flurry of blows with both hands, and then grab your weapon off your back.
