Merge spl-2020-08-05

Change-Id: Ia7cf8b053673069985f34df2328bc4d528f9405c