right, moved to 5.1. The concrete task is about refactoring / cleanup of the bootup sequence of the various components / services, etc.. That was mostly driven from needs of dynamic entities, so it's better to apply them together.