Merge reason: catch up with latest softlockup detector changes.
Attach a file by drag & drop or click to upload
