Merge SPL-2019-12-05

Change-Id: I4800033e0cacd10e02e6def120d2a8744a8196fc