Identify 'not-indexed' state correctly
Prefix not-indexed/connected-message-p.
Watch files on restore
Fix destructor renaming
Merge remote branch 'refs/remotes/upstream/master'