merging dricode changes