Revert "Revert "Revert "Ready for multi machien test"""

This reverts commit c748beb682f0cb2768639de5f21c1bccd6dda360.