Merge "Allow retry when wc_notify not successed"