wiki:Branches/MergeHydro/Martial_notes_on_merge