Merge "[fix][core] remove var definitions from finally block"