Merge spl-2020-12-05

Change-Id: I7aae6dd12b634b39801a736bd20e765446ef096d