Add first party caveat MR-6

@petebrowne @ecordell