Merge spl-2020-12-05

Change-Id: Idddb072c44921dcc9f2006595f39d5967eee0175