Merge spl-2020-12-05

Change-Id: I6a71dc321394c01c08c91377a6f5117ff2dc92fa