Align with submodules
Align with alf-core.