Merge spl-2021-01-05

Change-Id: I709911ebfd18ef16c1a66f07eb806079ea45ac99