This caused the failure of all procedural substructure creation after MR !100 was merged. gitlab #895