Merge spl-2020-12-05

Change-Id: I07a4ac69e83174f5fceae2d43a80f07b7af66ee3