Merge "af-binder: Add recent improvements and fixes"