Updates for 18 release
3 files changed