Move to stream 0.21.1-SNAPSHOT