Makes states invalidation more robust#872

gucio321 merged 1 commit intoAllenDang:masterAllenDang/giu:masterfrom

cjbrigato:ensure-cleanstatecjbrigato/giu:ensure-cleanstateCopy head branch name to clipboard