Upgrade: initialization and shutdown handling
Upgrade: initialization and shutdown handling

OmniLayer/omnicore,OmniLayer/omnicore,OmniLayer/omnicore,OmniLayer/omnicore,OmniLayer/omnicore,OmniLayer/omnicore