Merge SPL-2020-06-05

Change-Id: I0c7733480be835bb9aea89bda3eb69a53057cb7d