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