No param reuse master

same as #1146.
For master branch.