Merge "Propagate ancellation signal to cred man service"