Smoke 5.16.2 (ensure we are not affected by Encode leak) and bump latest 5.18
urgh