merging dev into VID-2067