Working on "join": making "join" trigger only once

Change-Id: I334b4da4bee75bf8bdbf7c4549b650806ff5417e
Merge "Working on "join": making "join" trigger only once"