Updated for v5.18.0-RC4