Merge "init: fix restarting of subcontext"