Working on "join": making "one" join value work (discriminator)

Change-Id: I1b08ed28196ff473a7cef47dea058401629979d1
Merge "Working on "join": making "one" join value work (discriminator)"