Merge "FTL: Add invariant for non-null pointers"