Merge spl-2020-12-05

Change-Id: I27557667ffc9edbf3c629171c199417bd8bbe981