Merge spl-2021-02-05

Change-Id: I7def0cd7207e012181d5388b3ae8d1b7ac33e97b