Draft: Resolve OPCUA-2845

Open Paris Moschovakos requested to merge OPCUA-2845 into master

Closes OPCUA-2845

Merge request reports