Merge "Fix potential memory leak." into pi-dev