Merge "Revert^4 "Add patchoat test""