Merge spl-2020-12-05

Change-Id: Ic460da274531c26c97766d2c14084f4a3e678d0a