Incorporate changes from dgo client

Posted by deepakjois:

deepakjois commented :

Fixed in 25bc26ab5fdf7b4d43db0ec46d9131214980ee6b