Merge spl-2020-12-05

Change-Id: I88caa345be2e559010a7b52befe9272105e9acae