Merge spl-2020-12-05

Change-Id: I40670ad950c9d4206f554216b80bad4231753fae