WL-3431 Pull in EVALSYS-1192 and EVALSYS-1189