Plain Diff
Resolve "Adapt core code to ease systems interfaces" See merge request fusiondirectory/fd!789