Update patches to 4.6.18 state