Merge spl-2021-03-05

Change-Id: I471bca64edcad35960aa31caf9d17d1d4a79af0c