v8.17 Fixes performance tracking issue from 8.16