Merge "[CPMS] Fixing double shutdown event"