merge danbri guha changes