Updated for v5.18.3 and v5.18.4