Feature #5027: Upgrade manual bindings