Update to 2.0.4-0-SNAPSHOT