Merge "leverage token_check only when posting results"