Merge SPL-2019-12-05

Change-Id: I300948d8f3a0ad647ecbba26e31d409b44542d6b