Eng 5359 fix 4.0.1