Merge spl-2020-12-05

Change-Id: I7a9aec51ef269f451145488a9a49523ece2a8d46