Update to 2.1.8 (#951265)