Vid 2009 cherry pick

merging branch into dev