Merge spl-2020-12-05

Change-Id: I7731c41ee2c1e96313494d662031a3434be92395