Merge spl-2021-02-05

Change-Id: I2a966a8df2512ce3f7990c3cd32f763226210b44