Merge spl-2020-12-05

Change-Id: Icc02cd1d1e15a8e3e471ab12b9f90f11d654226d