Change by tosunst as tosunvm is working on topic branch.