Merge SPL-2019-12-05

Change-Id: I7f6509bdcaddaf93e92fe6d7476d1fd8abc11cdf