Also allow HTML for appended attributes in another place
Merge remote-tracking branch 'nikki-bitbucket/mbs-7631-link-instruments' into beta

* nikki-bitbucket/mbs-7631-link-instruments:
  Also allow HTML for appended attributes in another place