Merge remote-tracking branch 'trans/3.10.2-translate' into 3.10.x