Merge "Fix memory leak due to smart pointer misuse."