Merge spl-2021-03-05

Change-Id: I51ed5dc9a7d4b8b92194dfc74103dca6f2c1517c