Merge spl-2020-12-05

Change-Id: I7f5a36f3284d73d6d69a71b1b3436f31773e595d