Merge spl-2020-12-05

Change-Id: I108ff4318d11bbc197c5eca1f3ffa4ccdf25db54