Merge "Revert "Release cblocks back to the free pool"" into sc-dev