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