Merge spl-2020-12-05

Change-Id: Ifd641841c5fc79996f1267e91ccdcba704240b90