Merge spl-2021-01-05

Change-Id: I91ef432bdf305abceffbc57cb4f79aae98781890