add str param
Merge branch 'n_branch' into dev