Rev for 2.1.8 release