Merge "Don't crash when there is no rollback dir" into main