Merge diman_v1 with master