Bug 6859 #1 Binding generator v1 refactoring