Merge TP1A.211006.001

Change-Id: Idfb0f6cd8cafaaf1eb4fcf90b79ac8c06ef28ef8