Keep storage alive in Router group management, backport to v0.11