LPS-44847 Use field wrappers instead of message keys