CAMEL-8048 Merged the registry of Main with thanks to Alexey