Merge "FTL: Add mixins for type-safe wrappers"