Merge spl-2021-03-05

Change-Id: Idc0c2d33aa91667ba0f309292270d28a7aa6cad4