Merge spl-2020-12-05

Change-Id: I2f566db90aec3a77875a244c87af6ec12f6b2d00