New: --persist-device switch