Merge branch "take-cheeze/shared_ptr"