Merge "Remove unused ONE_LOOP entry from speed feature"