Fix unit test after change to block id release logic.
Merge branch 'v1.12.x' into next