Merge spl-2020-12-05

Change-Id: I3c136bf1dbc83e2f5aec17d52876cc9178e05307