DF-5184 autobind refactoring