Use free-args
consistently in bootstrap
#111223
Merged
free-args
consistently in bootstrap
#111223