Include properties from latest 3.17.651.4 update per commit #b67d221dbf246ebaa105dff4891910ca4b260549