Merge "Replace shared_ptr with plain object"