Towards release 3.1.6