Merge spl-2020-12-05

Change-Id: I9cade9a22c329c2f375aa8a47f1939034fd42c7b