Merge "FTL: Add Optional<T>::or_else" into udc-dev