Merge SPL-2019-12-05

Change-Id: I73beee19c97e0733eae886bc317864eadd1b7588