Updated for v5.18.3-RC1