Pre-release of 2.1.7