6.0.0-16 Changes in 6.0.0-17