gentle shutdown + test
RoundRobinPolicy fix