Merge spl-2020-12-05

Change-Id: I0da43d3ff39cb0657cfa4b98b3394451d17087ec