Vid 1488 cherry pick

merging changes to dev after prod push