Merge spl-2020-12-05

Change-Id: I8e01135654bced27283461e42e5d0e60a97aa60e