Merge spl-2020-12-05

Change-Id: I4239c7f07a23573151c2eae0cec2a6fa9ea41fcc