Updated for v5.17.8