Making release 1.8.0 ready