Merge "TIF: Handle possible memory leaks" into nyc-dev