[shabbir]

Keep everything in the single thread. I have merged them as of now.