Merging dev into VID-1854