Merge SPL-2020-03-05
Change-Id: Iddb80d76db4eb227433c6f055ce64edc3e88bc0e