Merge "fix(tc): add notification support in tertiary SP manifest"