Merge spl-2020-12-05

Change-Id: Ibe0187aed0bdcb292df576beacd149de29f4e4ab