Merge remote-tracking branch 'vincent-ext/3.00.00.13_eng' into 12_eng