Merge SPL-2020-03-05

Change-Id: I0449612878bb7fdc82e2f56f6d7679985b838011