Merge "af-binder: Bump to cherry picked fixes" into guppy