Release 1.9.40

Change-Id: I81612b30ab2555aaeb12ba6dbaaac41d5f041b02