bugfix. the harbor and master service need to rewrite in future
Merge branch 'master' into dev