Merge changes from topic "add_participant" am: fdfc58fcd9

Change-Id: Iad1475ff41b45eda92075612afff7036089d793e