Merge spl-2020-12-05

Change-Id: I0b63f1975add05da188b8d72e05cf3dfcd2f68d3