Prepared the next iteration 2.0.4-SNAPSHOT