Merge SPL-2019-12-05

Change-Id: I661c13e92783d60e536a3d4f6a92a363a09910e1