Merge branch 'topic/yinghai-hostbridge-cleanup' into next