BUG-6859 - Binding generator v1 refactoring