change shutdown order
update invalidate-key flag name