Issue #5021: Update binding generator