Merge spl-2020-12-05

Change-Id: Ibe5cce0f6358d0f13b0f80a86bbfa12ec122c70e