Merge spl-2021-02-05

Change-Id: Ie6ee3144f9a0c072af8cb2ae26f981400476b57f