(Without this code change, you might get the doc changes into 1.6.0)