Merge spl-2020-12-05

Change-Id: I89ba8ccdc62f19ac034aebaaa5719554d1432a7a