Merge SPL-2019-12-05

Change-Id: I0823fb811a142f55203c3535bbd7327c203d9671