Merge "Stop using return within finally"