Merge spl-2020-12-05

Change-Id: I1ae00f1b7a63cb33e116d7c5845610fbc289f83b