Merge spl-2020-12-05

Change-Id: I003c0da16052e8e899905d632f1da534c3e1fc18