Merge spl-2020-12-05

Change-Id: I6ed31292793626bd99f610d8e96d5a88dec69196