Merge spl-2020-12-05

Change-Id: I03ee27abc4beaf892ce9e169db897c3b8609ec0d