WL-3218 Merge EVALSYS-1100.patch
Merge pull request #7 from ox-it/WL-3218

WL-3218 Merge EVALSYS-1100.patch