Updated for v5.17.10
Updated for v5.17.11