Merge afb-client