Merge spl-2020-12-05

Change-Id: I8e9abb3c6f63da7bd806e41d874b1f451e08d55e