Merge spl-2021-02-05

Change-Id: I80ee898aef01416dcd82a1f71e28421f9424eb35