Merge spl-2021-03-05

Change-Id: Ic933be63decc73c20805a613cd112ff281d39d9a