merging dricode repository changes