Merge hotfix aimpoint into dynamic collision volume gadget and set aimpoint for floating static units to 1/3 unit height