Merge spl-2020-12-05

Change-Id: I83593116ca51ae036dd69fb29f0353b62bd43cbe