Merge "feat(ff-a): change manifest messaging method" into integration