Merge "Support recheck and reverify in global-jjb"