Merge "Fixed cancel() and commit():"