Merge SPL-2019-12-05

Change-Id: I0f4596fef711d579eee787429d1caa23230fc6fe