Merged Narvalo.*.Extras projects