Merge spl-2020-12-05

Change-Id: Ic773b2b3c273676b43d0c59bb2a1965a18d56d18