Vid 1488 cherry pick

already pushed to prod, gotta push it to preview