Merge SPL-2019-12-05

Change-Id: I276b1c987e0f86612eb3a1355108ab774e1cf005