Merge SPL-2019-01-05

Change-Id: Id65bceb7ff38da2178d16abd5a90a50217c226b0