Does not include #2336 as the file has been moved out from underneath it: will do this separately
Add passphrase support to backup creation stage