ENG-4236 improved selfcheck2 MP poison pill