Add subtype, model and version OID's to find the correct service element Type to link to.
Merge remote-tracking branch 'origin/development' into development