Merge spl-2020-12-05

Change-Id: I6deeeb5cfb1da1572ff7e41a5066e07090f1a9ff