Getting ready for version 8/1.5.