add Nehal Hussain
sync with 3.4 branch