Merge spl-2020-12-05

Change-Id: I0d5ff472b4286290f59b680e907d1671dd46114b