Merge spl-2020-12-05

Change-Id: I063bdab77693352f58bfbe2b50e9b41ebd1e5585