Roll to next SNAPSHOT v2.0.2 and v6.0.2