use more specific name to avoid conflict.
Merge branch 'pr-regression-1459' into iij