Remove duplicate changes from second merge of devel