Merge "Use std::optional for active pointer id"