Merge "Experiment to use image domain dist in baseline." into nextgenv2