Merge spl-2020-12-05

Change-Id: I69783d4a113310787056116e57aea6d6d72e9811