Merge SPL-2019-02-05

Change-Id: I1ecca71e8cb5c54f12332002f2146fb495fd2cfe