Changes for 2.1.7 and 2.2.0-RC1 releases.