Merge SPL-2019-12-05

Change-Id: I16819cb2a3e8a1e5338a50e12d88dd45cd39efaa