Merge SPL-2019-12-05

Change-Id: I86074d633de19aa110fd2efbbacb8f662db072da