Merge SPL-2019-12-05

Change-Id: Id06ceff5ddd903b87d3f808cb69cd772da512127