Merge downstream changes
Prepare to better handle downstream default datadir rename
Add merge warning