add join delay
Merge branch 'master' into docker
remove test
Merge branch 'master' into docker