Merge spl-2020-12-05

Change-Id: Ic019ff3ca781e07c7705c523a58f1334296818fe