Merge "Update recheck trigger to match global-jjb"