Merge spl-2020-12-05

Change-Id: I70da44ac52f6ea128692afe4b0050689fc6cfa30