AIP-161: Field masks