Merge SP1A.210811.001

Change-Id: I339229c5ebf3a2ab8869e2281cfd77835d8fbe9a