Merge SPL-2019-08-01

Change-Id: Ibbfa7df878d414fdbfa59accf769e6e7dd097121