Merge "af-binder: Bug fix"