Merge branch 'oliviergoulet/master/462' into staging

Change-Id: If52d7b7a5fc398463d0602ca78eb5b3eca9aa01a