Preparing for upcoming release 3.1.7