Add 2WCR patch from @Nonverbose github