Merge "Use std::optional instead of std::unique_ptr"