Merge spl-2021-03-05

Change-Id: I6fbe04d78f84c55570c84563bc527c557fe17a3c