Updated for v5.20.1-RC1