Merge spl-2021-03-05

Change-Id: I3b7b9ff85668a6bafec5356ab3b8f6c589b84219