[Backport] Fix subtraction of civar#2783

soutaro merged 2 commits intoruby:aaa-3.10.xruby/rbs:aaa-3.10.xfrom

ksss:backport-subtractor-civarksss/rbs:backport-subtractor-civarCopy head branch name to clipboard