How to update a BP without updates to ADRC information?

Hi,

For EBP 4.0, I am seeing that any update to a BP will cause the Name and Search fields of all related address to be overwritten with the BP Name and Search data. Is there a way to allow a BP update without impacting the related addresses?

Regards,

- John