merge: bring emergency backup commit from plan9.krisyotam.com
wip: emergency backup (power outage risk)