Expand ~ in backup path
Merge branch 'master' into implement-maintenance-read-only-mode
Add isInXState() methods