Merge spl-2020-12-05

Change-Id: Iaff13d0e15a9a300ce45560118cc7b1702f9842f