Merge spl-2020-12-05

Change-Id: I1f09c6f3c4379578fff9fb97d6ffbf06b62b297c