Merge TP1A.211006.001

Change-Id: I2d3e439c29ade5e3bea81df381fd7c7eabee244b