Merge remote-tracking branch 't2m/foxfone-one' into bug1066505