Merge "Add missing "try ... finally" safeguards" into nyc-dev