Merge "binder: enable tidy"