WebUtilsService.resolveAttachmentReference() and
.resolveEntityReference() added