Sticking to conformal paths to keep merging into mainline possible.