Merge "Offset speed feature setting index" into nextgenv2