WL-3218 Merge EVALSYS-1100.patch