Merge spl-2020-12-05

Change-Id: I49b4495f907660023c5714aa8ec28ff1d277129e