[release3.7] Eng 4096