Updated for v5.18.2-RC2