Merge SP1A.210709.002

Change-Id: I2f5d8fd7e9c6ee7a123877056de89bdd3d772c69