Merge spl-2021-03-05

Change-Id: Ie0f27b9311a88b9a799e1e01d3981009baebe212