Merge spl-2020-12-05

Change-Id: Ie34732a0220aabdefb5570af876f6cc3b0b9daa7