merge conflict from manimanasamylavarapu revised 

merge conflict from manimanasamylavarapu revised