Update to latest support API
Merge pull request #2541 from danielgtaylor/support-update

Update to latest support API. Fixes #2541, #2426.