Release 191 vid 970

merging fixes from VID-970 into preview branch