Updates for 6.18