We now defensively guard against URI templates submitted for related resources and expand the incoming URI string source to avoid URI.create(…) to fail. Also, RepositoryPropertyReferenceController.loadPropertyValue(…) now also uses UriTemplate to guard against Uri templates provided for property references.