Update to 4.1.18
Merged 4.1.18