Merge changes Ib1090e39,I98aefe7c into main

* changes:
  ftl: non_null improvements
  ftl: contains