Merge spl-2020-12-05

Change-Id: I9d66f958945fa0b65aa38b4ec799ca6d6bed68e7