Issue #1909816 by japerry: Include patch to message to suppress field_ui errors.