Merge changes I931cc58b,Ic907a662

* changes:
  FTL: Downcast to Optional<T> implicitly
  FTL: Add Optional<T>::and_then