fix add port
Merge branch 'master' into benchmark