[MERGE] Send already attach to a double attach from the same client

Signed-off-by: David Goulet <dgoulet@efficios.com>