Merged back the Yizhong's fix which was overwritten by check-in of r2157,2158.