Merge TP1A.211022.002

Change-Id: I0501c5f72b6b4c684c2af53b1e88ca570c1fae65