Merge TP1A.211006.001

Change-Id: I0020c7487bbf420938b53bbdf1fa6c4916a4fe8c