#rnx
#rb none
#ROBOMERGE-SOURCE: CL 10869241 via CL 10869527 via CL 10869904
#ROBOMERGE-BOT: (v613-10869866)
[CL 10870586 by ryan durand in Main branch]
#rb sebastien.lussier
#rnx
#ROBOMERGE-SOURCE: CL 10810538 via CL 10810548
#ROBOMERGE-BOT: (v610-10636431)
[CL 10810550 by patrick enfedaque in Main branch]