Release 1.6.40

Updated 2840