Confluence doesn't display version-name but ID as value in JIRA Macro for version-customfield

As for several built-in customfield-types, Confluence seems to have trouble displaying the name of a version instead of just its ID when adding a custom version-field from JIRA as column in the JIRA macro on a Confluence-page. Please see jira_macro_version_customfield_only_displays_id.png

While I can comprehend, that this is due to the fact that the JIRA Macro in Confuence pulls the data from JIRA using XML and there, only the ID is contained, it should behave exactly like the default fields for version (fixed Version, affected Version) where the names are rendered properly in the JIRA Macro on Confluence.

This renders the option of a custom version-field somewhat useless when a team relies on displaying such information on Confluence.

Tested this on Confluence 5.9.11 with JIRA 7.1.7.
Confluence JIRA Plugin version 5.7.2
JIRA Integration::Plugin version 3.0.2
Confluence and JIRA Content Connector version 1.9.0

Please let me know whether you need any additional issues.

Update and potential Workaround:
We have digged through the Velocity-templates that are used for the XML-Export of the issues and could find, that the xml-version.vm-Template handles the value differently than, for instance, the xml-multiselect.vm:
xml-version.vm

#disable_html_escaping()
#if ($value)
    #foreach ($singleValue in $value)
<customfieldvalue>$!singleValue.id</customfieldvalue>
    #end
#end

xml-multiselect.vm

#disable_html_escaping()
#if ($value)
    #foreach ($singleValue in $value)
<customfieldvalue key="$singleValue.optionId"><![CDATA[$xmlutils.escapeForCdata($!singleValue.toString())]]></customfieldvalue>
    #end
#end

Adjusting the value of the customfieldvalue-Tag in the xml-version.vm accordingly, will fix the issue and render the version-name in Confluence instead of the version-ID, making the field useful within Confluence again. Please see jira_macro_version_customfield_after_vm_fix.png
The xml-version.vm looks like this now (on a JIRA 7.1.7):

#disable_html_escaping()
#if ($value)
    #foreach ($singleValue in $value)
<customfieldvalue key="$singleValue.id"><![CDATA[$xmlutils.escapeForCdata($!singleValue.toString())]]></customfieldvalue>
    #end
#end

It would certainly be much appreciated to have your feedback whether this is a safe workaround or expected to break things somewhere else. However as it's a customfield that's merely for personal documentation, I doubt it could have any negative impact other than maybe not being imported properly when doing an xml export and import.

Thank you for your consideration.

Regards,
Philipp Sendek [Adaptavist]