Committed version 3.0.beta.17