VID-2018 merging into dev