Update extras to 4.6.18 state