Merge spl-2020-06-05
Change-Id: I4c969f589f5a6db4f00b558bc1ed100d134ebe3c