Merge changes I35923e79,Icc1263eb

* changes:
  FTL: Refine container semantics
  FTL: Prevent InitializerList overflow