changes from prod raw_sink testing