Do finish blocks before leave them
Merge branch 'hotfix/goto'