Merge "RESTRICT AUTOMERGE Restart recognition when failing to deliver event" into sc-v2-dev