Update for patch 4.18