Merge spl-2020-12-05

Change-Id: I920cc41eb5620db186ff8ec788f3e34a9b2d9413