Merge spl-2020-12-05

Change-Id: Ic71239428f9ad04f9e63a4efc436bd1b9f2021f8