Replace boost::optional
with std::optional
#1344
Merged
boost::optional
with std::optional
#1344