Merge spl-2020-12-05

Change-Id: Ic7b1329deff5d2551c14700b3afeb042ca4e127f