[REQ] Replace use of no action values with C++17 std::optional #2269