Merge spl-2020-12-05

Change-Id: Idc33975c660f3793a9cf5f8d68f4ec5e4ecaf12b