Gh381 rename branch

call cancelHandler() instead