Merge spl-2020-12-05

Change-Id: I4f9a4af0ad6134e850d22c85fbafe102e5e44f6d