Merge SPL-2019-12-05

Change-Id: I6acd86236b5f1280eaf5c5b36c493fd7682d2d2f