Fix config extend when no user config present.
Friendlier paths.
Merge tapped in.
[ci skip]