Merge spl-2021-03-05

Change-Id: I22b66eb2df19597030849c8bb73f81b4e2730cb8