manually merging in from dricode repository