Merge spl-2020-12-05

Change-Id: I06eff191487cd4720e69623d53ba74f27c0d919b