Merge spl-2020-12-05

Change-Id: Idad1814af3d28a2603cc9d6967827a706f7a4ae2