[FIX] Restore free_sub_track scope and keep blockaddition cleanup#2270

Shiv0087 wants to merge 3 commits intoCCExtractor:masterCCExtractor/ccextractor:masterfrom

Shiv0087:patch-1Shiv0087/ccextractor:patch-1Copy head branch name to clipboard