Merge changes Ia03f7e3d,Ief31910b into main

* changes:
  FTL: Add Optional<T>::ok_or and FTL_TRY
  FTL: Touch up Concat