Merge master(2.3.4 changes) to develop

We have merged 2.3.4 branch changes directly to master to  make a release. We need to back port the changes to develop