Merge tag 'tags/restart-handler-for-v3.18' into next

Immutable branch with restart handler patches for v3.18