Merge spl-2021-02-05

Change-Id: I2574404fedd3ec4fb9c0314a675631c506ab0037