Merge "[MP03] Refactor probing class"