Merge remote-tracking branch 'origin/doc/16318-restore-asks-for-password' into featur...