6.0.0-17 Changes in 6.0.0-18