Merge spl-2020-12-05

Change-Id: I6589f3a3c90ff2d4907ec23ccd90085a5f7676f4