Merge SP1A.210812.003

Change-Id: Ide003b2cae17e7ed30918a0dead85877c6afe19a