#819 master

Merged
linfj merged 9 commits from openioctopus/octopus:master into master 7 months ago