Update to 7.18

Update to core.  Version 7.18