merging dev into VID-2018