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