For ENG-5579, add comments and an extra check for possible cleaned up partition