Merge SPL-2019-12-05

Change-Id: I7016279ffd73b57c35d30f17c6e6926fbf71d32a