Merge "Support multiple clients attaching to a module"