PMO-2443: auto registration of add on components
Merge branch 'PMO-2443'