commit cherrypick to 4.3

[Jayapal Reddy Uradi]

Hi Animesh,

Please cherry the pick the below commits from 4.3-forward to 4.3

37ce4e52c28081a0c718ca87fdbff79935074b75
7700a1b71622c1d45b2b54aa7444be5adc4fb8ab

Thanks,
Jayapal