Allow manual component registration
Merge remote-tracking branch 'origin/feature/manual-component-registry' into merged