Updated for v5.19.6
Updated for v5.18.2-RC1, better late than never