Merge spl-2020-12-05

Change-Id: I712f9c588fbfc3a8c18828a90a89dc5d9f5dd5f8