Merge spl-2020-12-05

Change-Id: Ibda89cd76910f523a53eae3f3b14c952e768cbeb