Revert "Merging dev into VID-1854"

This reverts commit 34e856c476e116e76c08b73bf8d17831581a4754.