Merge of dmoo patch