Merge of latest adsgut changes