Merge spl-2020-12-05

Change-Id: I8bf9c2d23c79f2b4a46e9182c57de606056de515