Merge remote-tracking branch 'vincent/3.00.00.11_eng' into tmp