Custom user profile fields with same name as core fields cannot be selected correctly

[jtsafran]

Moodle 3.10.9
tool_trigger: 2021030405

On the site this is being observed, there is a custom user profile field with a short name of "email". When you see that value in other places on the site (ldap config, saml2 config, etc), the name shows as field_map_profile_field_email vs the core email field of field_map_email.

In tool trigger, after doing a user lookup on a user created action and giving it a prefix of createduser_, you are given a list of fields that includes createduser_email twice and it seems like the action will use the core field.

Would it be possible to append the custom profile fields with profile_field_ or similar to match other Moodle functionality so both fields can be used?