[Tails-dev] Merges from Redmine: #5648, #7252

ThreadAutoreData ()
Mintrigeri