Merge SP1A.210709.002

Change-Id: Ia9ec063dc418fc010e3d164d88d6c83c2b64c942